From: Camm Maguire <camm@debian.org>
Date: Tue, 23 Jun 2026 22:39:34 +0000 (+0000)
Subject: [PATCH] <short summary of the patch>
X-Git-Tag: archive/raspbian/2.7.1-31+rpi1^2~4
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=93e4f7d22963bee44c18c12b05fdc2a1c6c9b1c9;p=gcl27.git

[PATCH] <short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.


Gbp-Pq: Name Version_2_7_2pre31
---

diff --git a/git.tag b/git.tag
index b5a6fe3b..18f43b77 100644
--- a/git.tag
+++ b/git.tag
@@ -1 +1 @@
-"Version_2_7_2pre30"
+"Version_2_7_2pre31"
diff --git a/h/pool.h b/h/pool.h
index 646520f2..4c219081 100644
--- a/h/pool.h
+++ b/h/pool.h
@@ -111,16 +111,20 @@ open_pool(void) {
 void
 close_pool(void) {
 
+  static int no_recur;
+
 #ifndef NO_FILE_LOCKING
-  if (pool!=-1) {
+  if (pool!=-1 && !no_recur) {
+    no_recur=1;
     f.l_type=F_WRLCK;
     if (!fcntl(pool,F_SETLK,&f))
       massert(!unlink(gcl_pool) || errno==ENOENT);
     register_pool(-1);
-    massert(!close(pool));
     massert(!munmap(Pool,sizeof(struct pool)));
+    massert(!close(pool));
     pool=-1;
     memset(gcl_pool,0,sizeof(gcl_pool));
+    no_recur=0;
   }
 #endif
   
diff --git a/o/disable_aslr.c b/o/disable_aslr.c
index a84a6506..77e18ca9 100644
--- a/o/disable_aslr.c
+++ b/o/disable_aslr.c
@@ -132,6 +132,14 @@ disable_aslr(int argc, char **argv, char **envp) {
   }
 
 }
+
+#else  /*Unneeded on Hurd, cygwin/mingw via coff header flag*/
+
+void
+disable_aslr(int argc, char **argv, char **envp) {
+  return;
+}
+
 #endif
 
 #endif